Added non-functional (in development) logics and components