catalog: Some methods implemented. Minnor changes.
catalog: Minnor changes