Improve logic component. Adjust marker API. Complete encryption part.