Started security, added type safety.