1. Changes according to new library architecture.
2. Removed unnecessarily constants.