Improved decoupling
Updated README