[aerogear-dev] Sync ideas with actual code